autorunManager: Don't show a right-click menu

Activating the source shouldn't be possible, and neither should
removing it.

https://bugzilla.gnome.org/show_bug.cgi?id=683438

diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index 38f93bc8cc2befe782a3c950e6ead88a8a7f0bbf..541c75ca7cd601e26e443a08ad430857152ac535 100644 (file)
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -284,6 +284,10 @@ const AutorunResidentSource = new Lang.Class({
         this._notification = new AutorunResidentNotification(this._manager, this);
     },
 
+    buildRightClickMenu: function() {
+        return null;
+    },
+
     addMount: function(mount, apps) {
         if (!shouldAutorunMount(mount, false))
             return;

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index fc39e661b47b8b3a4a107e062a5f75fa16adb762..f5fdeb447c7218948a7c5f75b8c1254f0036bc06 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2340,7 +2340,9 @@ const MessageTray = new Lang.Class({
                                                                                       Lang.bind(this, this._onSummaryBoxPointerContentUpdated));
         this._sourceDoneDisplayingId = this._summaryBoxPointerItem.source.connect('done-displaying-content',
                                                                                   Lang.bind(this, this._escapeTray));
-        if (this._clickedSummaryItemMouseButton == 1) {
+
+        let hasRightClickMenu = this._summaryBoxPointerItem.rightClickMenu != null;
+        if (this._clickedSummaryItemMouseButton == 1 || !hasRightClickMenu) {
             let newQueue = [];
             for (let i = 0; i < this._notificationQueue.length; i++) {
                 let notification = this._notificationQueue[i];